Autogenerated HTML docs for v1.5.2-86-g99b5
diff --git a/glossary.html b/glossary.html index 6e92a3b..970458b 100644 --- a/glossary.html +++ b/glossary.html
@@ -282,7 +282,7 @@ A bare repository is normally an appropriately named <a href="#def_directory">directory</a> with a <tt>.git</tt> suffix that does not have a locally checked-out copy of any of the files under - <a href="#def_revision">revision</a> control. That is, all of the <tt>git</tt> + revision control. That is, all of the <tt>git</tt> administrative and control files that would normally be present in the hidden <tt>.git</tt> sub-directory are directly present in the <tt>repository.git</tt> directory instead, @@ -329,7 +329,7 @@ <p> A list of objects, where each <a href="#def_object">object</a> in the list contains a reference to its successor (for example, the successor of a - <a href="#def_commit">commit</a> could be one of its parents). + <a href="#def_commit">commit</a> could be one of its <a href="#def_parent">parents</a>). </p> </dd> <dt> @@ -398,10 +398,10 @@ <dd> <p> An <a href="#def_object">object</a> which contains the information about a - particular <a href="#def_revision">revision</a>, such as parents, committer, + particular <a href="#def_revision">revision</a>, such as <a href="#def_parent">parents</a>, committer, author, date and the <a href="#def_tree_object">tree object</a> which corresponds to the top <a href="#def_directory">directory</a> of the stored - <a href="#def_revision">revision</a>. + revision. </p> </dd> <dt> @@ -442,8 +442,8 @@ <dd> <p> Normally the <a href="#def_HEAD">HEAD</a> stores the name of a - <a href="#def_branch">branch</a>. However, git also allows you to check - out an arbitrary commit that isn't necessarily the tip of any + <a href="#def_branch">branch</a>. However, git also allows you to <a href="#def_checkout">check out</a> + an arbitrary <a href="#def_commit">commit</a> that isn't necessarily the tip of any particular branch. In this case HEAD is said to be "detached". </p> </dd> @@ -452,7 +452,7 @@ </dt> <dd> <p> - You are <strong>waaaaay</strong> behind. + You are <strong>waaaaay</strong> behind. See <a href="#def_index">index</a>. </p> </dd> <dt> @@ -469,7 +469,7 @@ <dd> <p> A <a href="#def_working_tree">working tree</a> is said to be "dirty" if - it contains modifications which have not been committed to the current + it contains modifications which have not been <a href="#def_commit">committed</a> to the current <a href="#def_branch">branch</a>. </p> </dd> @@ -484,6 +484,15 @@ </p> </dd> <dt> +<a id="def_evil_merge"></a>evil merge +</dt> +<dd> +<p> + An evil merge is a <a href="#def_merge">merge</a> that introduces changes that + do not appear in any <a href="#def_parent">parent</a>. +</p> +</dd> +<dt> <a id="def_fast_forward"></a>fast forward </dt> <dd> @@ -535,7 +544,7 @@ <p> Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way - you can make git pretend the set of parents a <a href="#def_commit">commit</a> has + you can make git pretend the set of <a href="#def_parent">parents</a> a <a href="#def_commit">commit</a> has is different from what was recorded when the commit was created. Configured via the <tt>.git/info/grafts</tt> file. </p> @@ -553,7 +562,7 @@ </dt> <dd> <p> - A named reference to the <a href="#def_commit">commit</a> at the tip of a + A <a href="#def_ref">named reference</a> to the <a href="#def_commit">commit</a> at the tip of a <a href="#def_branch">branch</a>. Heads are stored in <tt>$GIT_DIR/refs/heads/</tt>, except when using packed refs. (See <a href="git-pack-refs.html">git-pack-refs(1)</a>.) @@ -564,7 +573,7 @@ </dt> <dd> <p> - The current branch. In more detail: Your <a href="#def_working_tree">working tree</a> is normally derived from the state of the tree + The current <a href="#def_branch">branch</a>. In more detail: Your <a href="#def_working_tree">working tree</a> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <a href="#def_head">heads</a> in your repository, except when using a <a href="#def_detached_HEAD">detached HEAD</a>, in which case it may @@ -589,7 +598,7 @@ checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the - <tt>$GIT_DIR/hooks/</tt> <a href="#def_directory">directory</a>, and are enabled by simply + <tt>$GIT_DIR/hooks/</tt> directory, and are enabled by simply making them executable. </p> </dd> @@ -599,10 +608,10 @@ <dd> <p> A collection of files with stat information, whose contents are stored - as objects. The index is a stored version of your working - <a href="#def_tree">tree</a>. Truth be told, it can also contain a second, and even - a third version of a <a href="#def_working_tree">working tree</a>, which are used - when merging. + as objects. The index is a stored version of your + <a href="#def_working_tree">working tree</a>. Truth be told, it can also contain a second, and even + a third version of a working tree, which are used + when <a href="#def_merge">merging</a>. </p> </dd> <dt> @@ -708,7 +717,7 @@ </dt> <dd> <p> - To <a href="#def_merge">merge</a> more than two branches. Also denotes an + To <a href="#def_merge">merge</a> more than two <a href="#def_branch">branches</a>. Also denotes an intelligent predator. </p> </dd> @@ -720,9 +729,9 @@ The default upstream <a href="#def_repository">repository</a>. Most projects have at least one upstream project which they track. By default <em>origin</em> is used for that purpose. New upstream updates - will be fetched into remote tracking branches named + will be fetched into remote <a href="#def_tracking_branch">tracking branches</a> named origin/name-of-upstream-branch, which you can see using - "git <a href="#def_branch">branch</a> -r". + "<tt>git branch -r</tt>". </p> </dd> <dt> @@ -851,7 +860,7 @@ </dt> <dd> <p> - A <a href="#def_refspec">refspec</a> is used by <a href="#def_fetch">fetch</a> and + A "refspec" is used by <a href="#def_fetch">fetch</a> and <a href="#def_push">push</a> to describe the mapping between remote <a href="#def_ref">ref</a> and local ref. They are combined with a colon in the format <src>:<dst>, preceded by an optional plus sign, +. @@ -869,11 +878,12 @@ </dt> <dd> <p> - A collection of refs together with an + A collection of <a href="#def_ref">refs</a> together with an <a href="#def_object_database">object database</a> containing all objects which are <a href="#def_reachable">reachable</a> from the refs, possibly - accompanied by meta data from one or more porcelains. A - repository can share an object database with other repositories. + accompanied by meta data from one or more <a href="#def_porcelain">porcelains</a>. A + repository can share an object database with other repositories + via <a href="#def_alternate_object_database">alternates mechanism</a>. </p> </dd> <dt> @@ -925,8 +935,8 @@ </dt> <dd> <p> - A shallow repository has an incomplete - history some of whose commits have parents cauterized away (in other + A shallow <a href="#def_repository">repository</a> has an incomplete + history some of whose <a href="#def_commit">commits</a> have <a href="#def_parent">parents</a> cauterized away (in other words, git is told to pretend that these commits do not have the parents, even though they are recorded in the <a href="#def_commit_object">commit object</a>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the @@ -953,7 +963,7 @@ </dt> <dd> <p> - A <a href="#def_ref">ref</a> pointing to a tag or + A <a href="#def_ref">ref</a> pointing to a <a href="#def_tag_object">tag</a> or <a href="#def_commit_object">commit object</a>. In contrast to a <a href="#def_head">head</a>, a tag is not changed by a <a href="#def_commit">commit</a>. Tags (not <a href="#def_tag_object">tag objects</a>) are stored in <tt>$GIT_DIR/refs/tags/</tt>. A @@ -971,7 +981,7 @@ An <a href="#def_object">object</a> containing a <a href="#def_ref">ref</a> pointing to another object, which can contain a message just like a <a href="#def_commit_object">commit object</a>. It can also contain a (PGP) - signature, in which case it is called a "signed <a href="#def_tag_object">tag object</a>". + signature, in which case it is called a "signed tag object". </p> </dd> <dt> @@ -1004,7 +1014,7 @@ </dt> <dd> <p> - Either a <a href="#def_working_tree">working tree</a>, or a <a href="#def_tree_object">tree object</a> together with the dependent blob and tree objects + Either a <a href="#def_working_tree">working tree</a>, or a <a href="#def_tree_object">tree object</a> together with the dependent <a href="#def_blob_object">blob</a> and tree objects (i.e. a stored representation of a working tree). </p> </dd> @@ -1059,7 +1069,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 19-May-2007 04:19:47 UTC +Last updated 27-May-2007 04:28:37 UTC </div> </div> </body>
